Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
authorTom Rini <[email protected]>
Wed, 4 Nov 2015 23:30:51 +0000 (18:30 -0500)
committerTom Rini <[email protected]>
Wed, 4 Nov 2015 23:30:51 +0000 (18:30 -0500)

Trivial merge